--- a/dcmjpls/CMakeLists.txt
+++ b/dcmjpls/CMakeLists.txt
@@ -2,6 +2,6 @@
- PROJECT(dcmjpls)
+ project(dcmjpls)
# recurse into subdirectories
--FOREACH(SUBDIR libsrc libcharls apps include)
-+FOREACH(SUBDIR libsrc apps include)
- ADD_SUBDIRECTORY(${SUBDIR})
- ENDFOREACH(SUBDIR)
+-foreach(SUBDIR libsrc libcharls apps include)
++foreach(SUBDIR libsrc apps include)
+ add_subdirectory(${SUBDIR})
+ endforeach()
--- a/dcmjpls/libsrc/djerror.h
+++ b/dcmjpls/libsrc/djerror.h
@@ -24,7 +24,7 @@
result = DJLSError::convert(err);
if (result.good())
-@@ -1055,7 +1055,7 @@
+@@ -1071,7 +1071,7 @@
size_t bytesWritten = 0;
@@ -8,5 +8,5 @@
# make sure executables are linked to the corresponding libraries
- FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
+ foreach(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
- DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
+ DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd)
- ENDFOREACH(PROGRAM)
+ endforeach()
--- a/dcmjpls/libsrc/CMakeLists.txt
+++ b/dcmjpls/libsrc/CMakeLists.txt
@@ -4,4 +4,4 @@
Author: Mathieu Malaterre <malat@debian.org>
--- a/CMake/GenerateDCMTKConfigure.cmake
+++ b/CMake/GenerateDCMTKConfigure.cmake
-@@ -134,10 +134,10 @@
- SET(ENVIRONMENT_PATH_SEPARATOR ";")
+@@ -114,15 +114,7 @@
+ #endif()
+
+ # Configure file
+-
+-# Windows being windows, it lies about its processor type to 32 bit binaries
+-set(SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}")
+-if(NOT SYSTEM_PROCESSOR)
+- set(SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+-endif()
+-# CMake doesn't provide a configure-style system type string
+-set(CANONICAL_HOST_TYPE "${SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}")
+-DCMTK_UNSET(SYSTEM_PROCESSOR)
++set(CANONICAL_HOST_TYPE "Debian")
+
+ # Configure dictionary path and install prefix
+ if(WIN32 AND NOT CYGWIN)
+@@ -134,10 +126,10 @@
+ set(ENVIRONMENT_PATH_SEPARATOR ";")
# Set dictionary path to the data dir inside install main dir (prefix)
- IF(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
-- SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\dicom.dic")
-+ SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\dicom.dic")
+ if(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
+- set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\dicom.dic")
++ set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\dicom.dic")
# If private dictionary should be utilized, add it to default dictionary path.
- IF(ENABLE_PRIVATE_TAGS)
-- SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\private.dic")
-+ SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\private.dic")
- ENDIF(ENABLE_PRIVATE_TAGS)
+ if(ENABLE_PRIVATE_TAGS)
+- set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\private.dic")
++ set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\private.dic")
+ endif()
# Again, for Windows strip all / from path and replace it with \\.
- STRING(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}")
-@@ -155,10 +155,10 @@
- SET(ENVIRONMENT_PATH_SEPARATOR ":")
+ string(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}")
+@@ -155,10 +147,10 @@
+ set(ENVIRONMENT_PATH_SEPARATOR ":")
# Set dictionary path to the data dir inside install main dir (prefix).
- IF(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
-- SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/dicom.dic")
-+ SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/dicom.dic")
+ if(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
+- set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/dicom.dic")
++ set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/dicom.dic")
# If private dictionary should be utilized, add it to default dictionary path.
- IF(ENABLE_PRIVATE_TAGS)
-- SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/private.dic")
-+ SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/private.dic")
- ENDIF(ENABLE_PRIVATE_TAGS)
- ELSE(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
- SET(DCM_DICT_DEFAULT_PATH "")
+ if(ENABLE_PRIVATE_TAGS)
+- set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/private.dic")
++ set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/private.dic")
+ endif()
+ else()
+ set(DCM_DICT_DEFAULT_PATH "")
--- a/dcmdata/data/CMakeLists.txt
+++ b/dcmdata/data/CMakeLists.txt
@@ -1,5 +1,8 @@
# declare installation files
--INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data)
-+SET(DCMTK_INSTALL_DATDIR "share/libdcmtk${DCMTK_ABI_VERSION}")
+-install(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data)
++set(DCMTK_INSTALL_DATDIR "share/libdcmtk${DCMTK_ABI_VERSION}")
+
-+INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
-+INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)
++install(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
++install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)
# add paths to the dictionaries to a CMake variable for being used by the unit tests
- SET(DCMTK_DICOM_DICTIONARIES
+ set(DCMTK_DICOM_DICTIONARIES
Subject: [PATCH] Fixed OFoptional by introducing OFalign?
--- a/CMake/osconfig.h.in
+++ b/CMake/osconfig.h.in
-@@ -1165,4 +1165,7 @@
+@@ -1180,4 +1180,7 @@
/* Define if we are supposed to use STL's system_error */
#cmakedefine HAVE_STL_SYSTEM_ERROR @HAVE_STL_SYSTEM_ERROR@
#endif /* !OSCONFIG_H*/
--- a/config/aclocal.m4
+++ b/config/aclocal.m4
-@@ -1953,6 +1953,47 @@
+@@ -1971,6 +1971,47 @@
fi
])
dnl This macro checks if a given preprocessor symbol exists and is a string
--- a/config/configure
+++ b/config/configure
-@@ -16752,6 +16752,66 @@
+@@ -16924,6 +16924,66 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
Last-Update: Fri, 15 May 2015 16:39:01 UTC
--- a/dcmnet/libsrc/dul.cc
+++ b/dcmnet/libsrc/dul.cc
-@@ -1897,7 +1897,7 @@
+@@ -1916,7 +1916,7 @@
msg += OFStandard::getLastNetworkErrorCode().message();
return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
}
* Disable the so-called Nagle algorithm (if requested).
--- a/dcmnet/libsrc/dulfsm.cc
+++ b/dcmnet/libsrc/dulfsm.cc
-@@ -2461,7 +2461,7 @@
+@@ -2476,7 +2476,7 @@
msg += OFStandard::getLastNetworkErrorCode().message();
return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
}
--- a/CMake/dcmtkMacros.cmake
+++ b/CMake/dcmtkMacros.cmake
@@ -60,11 +60,11 @@
- ENDIF(WIN32 AND NOT MINGW)
+ endif()
# Collect executable as part of global DCMTK_EXECUTABLE_TARGETS property
-- SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
-+# SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
+- set_property(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
++ #set_property(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
# declare installation files, also export DCMTKTargets.cmake
- INSTALL(TARGETS ${PROGRAM}
+ install(TARGETS ${PROGRAM}
- EXPORT DCMTKTargets
-+# EXPORT DCMTKTargets
++ # EXPORT DCMTKTargets
COMPONENT bin
DESTINATION ${CMAKE_INSTALL_BINDIR})
- ENDIF(BUILD_APPS)
+ endif()
Required for reproducible builds, and it is also not reliable
Author: Gert Wollny <gw.fossdev@gmail.com>
---- a/CMake/GenerateDCMTKConfigure.cmake
-+++ b/CMake/GenerateDCMTKConfigure.cmake
-@@ -114,15 +114,7 @@
- #ENDIF(VTK_USE_ANSI_STDLIB)
-
- # Configure file
--
--# Windows being windows, it lies about its processor type to 32 bit binaries
--SET(SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}")
--IF(NOT SYSTEM_PROCESSOR)
-- SET(SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
--ENDIF(NOT SYSTEM_PROCESSOR)
--# CMake doesn't provide a configure-style system type string
--SET(CANONICAL_HOST_TYPE "${SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}")
--DCMTK_UNSET(SYSTEM_PROCESSOR)
-+SET(CANONICAL_HOST_TYPE "Debian")
-
- # Configure dictionary path and install prefix
- IF(WIN32 AND NOT CYGWIN)
---- a/CMake/dcmtkPrepare.cmake
-+++ b/CMake/dcmtkPrepare.cmake
-@@ -376,11 +376,6 @@
- OPTION(DCMTK_FORCE_FPIC_ON_UNIX "Add -fPIC compiler flag on unix 64 bit machines to allow linking from dynamic libraries even if DCMTK is built statically" OFF)
- MARK_AS_ADVANCED(DCMTK_FORCE_FPIC_ON_UNIX)
-
-- # Setting for IA64 / x86_64 which needs -fPIC compiler flag required for shared library build on these platforms
-- IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND DCMTK_FORCE_FPIC_ON_UNIX)
-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-- ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND DCMTK_FORCE_FPIC_ON_UNIX)
-
- ENDIF(WIN32)
-
03_datadic_install.patch
04_Fixed-OFoptional-by-introducing-OFalign.patch
05_performance.patch
-06_soversion_abi.patch
07_dont_export_all_executables.patch
08_remove_system_processor.patch
09_fix_format_on_32bit.patch
projects / dcmtk.git / commitdiff